Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 22 Nov 2014 11:38:21 +0000 (12:38 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 22 Nov 2014 11:38:21 +0000 (12:38 +0100)
commitb559a60382a3e192250e533c4a9daecacabd4026
tree5ccdc9b7c02aac1df8da5fb7f3a6bd4cd2e57eeb
parentcd22fd754b71ff64bbabd05bb6df2df8fa5a8915
parentcec23966252b5f4d87c6c6b56c7660b8d578865c
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs